Auto merge of #5599 - gibix:fix/4746, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 1 Jun 2018 15:44:37 +0000 (15:44 +0000)
committerbors <bors@rust-lang.org>
Fri, 1 Jun 2018 15:44:37 +0000 (15:44 +0000)
commitcddf9add1fac47cf765c2e2bb8931751e8b59616
treec9467fda8c56b7c6c7592f098aa026ba75e8441f
parent5fc6eadc362e52c885a8cf24b924be53467fe65f
parent4f0e13617a293257097a3f9fc44343ea0bff5f7e
Auto merge of #5599 - gibix:fix/4746, r=alexcrichton

fix #4746 and add test